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

Change-Id: Ia46c42bb15d4dd1159fa0ec4409e3db9c54df19c