Merge changes I7e8fcd2e,Ie12d743c am: 547f7393d7
am: 8283b186be

Change-Id: I6404f454941195d60cbd222adb3e6912376966c7