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

Change-Id: I64f39cc6d33f05ddf91d34b3b3890b2904c90e95