resolve merge conflicts of e8c6801367 to cw-e-dev.

Change-Id: I9c5a0be4e18cc27e163da60ba9dd81ae71588bef
1 file changed