[automerger] Merge changes from topic "am-5291fbc5-4703-40f7-83aa-7828fdb2b7fc" into mnc-dr-dev am: 73d84bdb38 am: fb50a29911

Change-Id: I7a2bf111685f88d99835072938fdcf71ac63a1d6