Merge changes from topic "am-487b3a4e-6c35-49a5-a21b-805401f2196b" into cw-f-dev
am: 2a139ea31b

Change-Id: I4aca030c7e4e3d0b57b4104e698fa74dc78a0305