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