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

Change-Id: I9fc74184cbca3709d527672ab4dbd0fa809b1049