Merge "Merge changes from topic "am-5291fbc5-4703-40f7-83aa-7828fdb2b7fc" into cw-e-dev am: fc38012e" into mnc-dr1.5-dev