Cumulative patch from commit 37fd0be2d3ca50c9035e67041328099356a46860 am: 4ae50e65ef
am: a09d6b3e21

Change-Id: Ib49ea6402924d0e1104f3c501562f6c64a4e0866