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