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

Change-Id: Ie97aeef033f3637685dd2dd56020bb9eb2f78a3b