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

* commit '44157a4abf36250f259eca4cdaa346be15d47738':
  Fix broken build due to @RemotableViewMethod

Change-Id: I8ea8b32a7e57d479ee46bd8f43930f1ea53a5919