Merge changes I8dcc30b0,I85292ad2,Ie0ab3534 am: ffec1a0c68
am: 8d0a8ed985

Change-Id: I0eb99bc2c2d1ec67c23ad020627a2cf43cfbb71d