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

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

Change-Id: Iad3e7a73952046d00e533ddb0ccabe28d3d646c6