Merge changes I1bf07301,I48e8ebf3 am: c17c5b00e1 am: d4aca92af5 am: 6b68c656d0

Change-Id: Iba9c0f6a5672498fd85708aee8be1c0a810f637e