Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8" into cw-f-dev
am: 64d955b9b9

Change-Id: I444003f18953348f0861a4b64c44127d661737c3