Merge changes I70eafe03,Ia44e16c5
am: b52f49153c

Change-Id: I58da92a4ad77166f68a0aaec6f3fcc4ceeefc3f9