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

* commit '0dd862333c99f99bc0c7a236a0f59ca665d21566':

Change-Id: I8abea63789e910b26c97ef027c0ef2403b05952a