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

Change-Id: Ie69a551cb95e45a0d226ff7ed087200290e22845