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

Change-Id: I261e7478acd0e1e8330536b2694ff164d5e51db9