[automerger] Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into cw-e-dev am: 16e1cbc2 am: a0f9fb4a am: 8c2d760c am: eb428146 Change-Id: Icc20d137b323c9757514c37d38a948e2093beff7