[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dev am: c17b510a15 am: f56750b169 am: 6c09cf96c6

Change-Id: Idb73013dcee5ce9239e52f1168288db9313ae30d