Merge changes I30e39943,I4b5fb782,I8fe0ddbd into cw-f-dev
am: 1c0dba5014

Change-Id: I45f36e954ad432bbb5117b50ab2b7c56974afdbd