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

Change-Id: Iea56b57eb72a22d52d270686659903b0cb5006b5