Merge "Cumulative patch from commit 05e5e615e6a26d7a9f5bd0569a0baeae1bcdee49" am: 642cc64d37 am: e4c3085a9a am: a3083b7af5
am: 16cac26b8f

Change-Id: Ic15f58f75d333cf2d100c4e51ee02ca2dc0d94b6