Cumulative patch from commit 8960afa4bfa423774a8ca58cc21a4a7c1ab6089e am: 849734c8d1 am: 1ccbf747b9
am: 839fbaa37d

Change-Id: I13bfbbebad6f8fc19f913bed3a74ca2e562cb865