Merge changes I2ddfef0c,I49bee0c9 am: ca046e898b
am: a6109ea3a0

Change-Id: I552730badc910df5f5a48c2ded6566071b604783