Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev am: 44157a4abf
am: d9edb23fa8

* commit 'd9edb23fa88bb90eb3458c091536560ae1bffd96':

Change-Id: Ifc3714620b71ac050e658e247343993e8e09a0e5