[automerger] Merge changes from topic "am-5291fbc5-4703-40f7-83aa-7828fdb2b7fc" into cw-e-dev am: fc38012e am: 79a782ad am: 39c7fa20 Change-Id: Iaa524d6c02f9bf2f203e808b152248763bfb6277