[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev am: 1d98dc05a5 am: 460898007c am: 8ebf804e5e am: c6e8953cd2

Change-Id: Idf3c1aa24dd59ada25e47e8b8d6f0eb7fbb4dbe8