Merge "Cumulative patch from commit 128f6a98b3d4d6ed103db759707309f451db9682"
am: 26c0111430

Change-Id: Iebe9b0fb827103f8ae40014511bc7399dd3fcb13