Merge changes I1b2e34d5,I75ae5b29 am: 9ffa786b56 am: 58cc56483f

Change-Id: I3eb95dc7ffd304747458fee233e21e4240e4bcdb