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

Change-Id: I0553806b7395e23bef2b9dfd7c9ab263f5eba1c0