[automerger] Merge changes from topic...

[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc am: dae4e83e am: aef43d6e am: 7bd55073 am: 7f50792e

Change-Id: I680e0d1138855fb67a4dd4c5ca5d33424e523dff