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

Change-Id: I290e7e847f8115aedb14d74ef8df48c23e1a03a3