Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into cw-f-dev
am: 5de5d129f3

Change-Id: I5217ec9a81584b59067207ac8e42d46e93657d47