Merge changes Iee2d74a3,Ib2298818 am: 1d0c5b63ce am: 335a8ea64a
am: 38621c800d

Change-Id: Ic286fc66c20d2fd9328dcd5024f87315815e636c