am: 84e85f2e * commit '84e85f2e': Fix broken build due to @RemotableViewMethod Change-Id: I1b9e318c15f47dbded0b9490a10b957340cb432a