[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev am: 371e4fc283 am: d6636186d1 am: f1d1bcda9f

Change-Id: I9a6c0128c2e85fab2f40dde49e43c77b385d2eb9