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

Change-Id: Id9c788b5c532d96a3618c87e7303f226d89d1a1c