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

Change-Id: I94e83e95f0e2e8e62fbc8f50f2475ea74489da70