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