Merge changes from topic "am-87fa6287e26b43019fb39820defaca58" into cw-f-dev am: db14b70c3b
am: 86268bcb1d

Change-Id: Iaab7f039b621afd4ae47e8c979c5971c3563aec9