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

* commit '84e85f2e5640b5abc824d25ba941ced9dbce46f5':
  Fix broken build due to @RemotableViewMethod

Change-Id: I1b9e318c15f47dbded0b9490a10b957340cb432a