Merge changes I2dee064c,I0edbbabf into arc-apps
am: 6041358900

Change-Id: I7b71146056280be771e6951f36245a94a25f6a7c