resolve merge conflicts of e5743753 to master.

Change-Id: I83f4b6abb669963b9c4fcdf9870317e019360d46