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

Change-Id: Icc3903d0c3bd6ccd36d9e7649798a9bc48be5021