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

Change-Id: I545a0ba01a96656173e87d5fbcff43ca4ce44d4c