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

Change-Id: Ibc2ec74bd43e2bf60d4c8f42de6edffd595c425f