Cumulative patch from commit 37fd0be2d3ca50c9035e67041328099356a46860
am: 4ae50e65ef

Change-Id: I5eced825a0aa871e5597f35cd35327258a5f5b20