Merge "Cumulative patch from commit a9491695b30a7f750dc45cb563d813b03f1d4b8d" am: 22b351bc7b am: ac8397fb18 am: 47212ab44f
am: dd55807a09

Change-Id: I6a40b186f3c5a0a2d8def214959f3e7d235722ae