Merge changes from topic "am-ea26f4fbab264f25a0305b84fec99dfd" into cw-f-dev
am: 95f27c865f

Change-Id: Ibea82e4167cca75126e3428b5836af9095d65d08