Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am: 502986f72a
am: 5223106231

Change-Id: I87ec29fb8b0ec5f61841b0596f0628d1e6cb0c71