Merge "Fix broken build due to @RemotableViewMethod" into nyc-dev