Merge changes Ib9d0f4fc,I47195f91,Ib26ef543 into cw-f-dev am: 79665f9679
am: eb78c35466

Change-Id: I86e2dfff882ad6d453608a9ba01cf9121597afb2