Merge "Fixing incomplete RemoteAction clone" into pi-dev am: 739199f3e9
am: a1ef7a933b

Change-Id: I07ba0ae9fbfc795f36fd2ddd6acf4c5d18cfd154