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

* commit '035b1d1c27a85ccb83c425e0e76458ee5c9db42c':
  Fix broken build due to @RemotableViewMethod

Change-Id: If70a4a63991756b7d8bec8236be09caa7705882e