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

Change-Id: I2be674e0af4b2ea9c6725d8d896d4bc2150d801f