Merge changes from topic "am-1fb2f9b6011849d595f6e5c286f9e769" into cw-f-dev
am: 1ca16da11e

Change-Id: I8b1d29a6bc05df89dac6054b4fe6618d8290cd5d