resolve merge conflicts of 5a1e5edeb7 to master.

Change-Id: Ie980796ac4f02e82d6d734e5e124fb885302e18d