Merge "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950" am: c15e6e5191
am: f23fbc6dff

Change-Id: I63c6c66c0078b170af26915102bc6ae1048c7852