Merge changes I6672c5b0,Ie053a5d8 am: da26bc7cff am: f88aaa1ceb
am: f48ab3d1c3

Change-Id: I6e8976dc322ae79a5924958a7cc675556913259a