Merge "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950" am: fa94a1c1e3 am: 89bf0cf1bc
am: 0ee8e6194b

Change-Id: If238b5070bbe74ff2d173de4eb0e707b00b6de9e