Merge changes I71ab8819,I8bf37923
am: cad61afc10

Change-Id: I21fac30775b58b43d59e3b439a9e7d32a49f21e3