[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr1.5-dev am: 1e314546c8 am: f0bda45342

Change-Id: Ie1ab3d7a0ea225514da994010dfe0f12e961aabe