Merge changes I93a1c003,I283fec89
am: e133feb6b4

Change-Id: I840cf1b37e2e1f69992bb38d0dffb3fd8c615f23