Merge changes I8f2cc1b0,Ief62aa57 am: 058357a509 am: 3ad829bef6
am: 1229024898

Change-Id: Ib400ec99b5e15880b08ecb5cc1385b18358225f6