Merge "Cumulative patch from commit fcd85d9a3f2d9d63d0fa57e93446ad467db75b23" am: 30b597e5a4 am: aa30cb7f71 am: ccadb63229
am: 68b235b732

Change-Id: Iba98ca281ab417f0aaa4f455424685acd5413c94