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

Change-Id: Ice0ad1137fd5dc0f0415f72d385a5a4502f7235e