[automerger] Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev am: fea4158e am: 8fbe4e67 am: 3534bc97 am: 4021c84e Change-Id: Ib248b06c7d6a3c90020e43e04554af39918be955