Cumulative patch from commit 8960afa4bfa423774a8ca58cc21a4a7c1ab6089e
am: 849734c8d1

Change-Id: I591b6635fc8059bf245526167117ffdd8bf53ccd