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

Change-Id: Ib2c997329c94d81219979fa7b7360ffe256da74b