resolve merge conflicts of 725833e024 to master.

Change-Id: I68b8737e3bc2bd7bffd7625114723bc1efa47398