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