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

Change-Id: I6677925be1073eaf46ddfb9e4e895d8e3059af70