Cumulative patch from comit b97a54108732b8b5048f86388bed305df21ea8e5
am: 7f2c753f60

Change-Id: I97f534460dce8da780bd18f936b29cd76fed35a6