resolve merge conflicts of 7b6027dde4 to master.

Change-Id: I1d5232f61744bb18ca5de3a16a340bc3afd110bb