Merge changes from topic "am-ee7c6fe117b1402595ddcb16a745b06d" into cw-f-dev am: 4f314386df
am: c954935198

Change-Id: Iac4bcd80a6dccb696c45bcf929df270ab4d67390