Merge changes from topic "am-76dda0ffdd8c46b3a2fa282fdfee692b" into cw-f-dev
am: 06a38e3ace

Change-Id: Id1e9d2f827a2dfa15bdc11f9f3c89a4a95015a5e