Merge changes Ie3d5e176,Ic1fbb885,I10bafcff
am: 3955baf83f

Change-Id: I449e532cd4061667213fea7a999278f7a52f6b9f