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