Cumulative patch from comit b97a54108732b8b5048f86388bed305df21ea8e5 am: 7f2c753f60
am: f6c872667a

Change-Id: Iaaea9a008e9fd843e36dde11e3f1f054c531772c