[automerger] Merge changes from topic "am-5291fbc5-4703-40f7-83aa-7828fdb2b7fc" into mnc-dr-dev am: 73d84bdb am: fb50a299 am: 9bc87b08 Change-Id: Id2c693c7f6b5445f03a71e23312a31394ccc125a