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

Change-Id: Ie2e85651eeeb7541fd2c066ce0c2b69ee70b872f