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

Change-Id: I09676a64de5e5984af004938517d8ec45ab33977