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

Change-Id: Ibf7008b1e05b0d81ba05e5ddc22e8b56848e0fed