Merge changes from topic "am-e3e9d1cd3f2b47edb8d57d28a1e970b5" into cw-f-dev
am: 3f75df07b2

Change-Id: I6c9fc477303ec1863767913f44f08c3636b53520