cherry-picked fd064c4a176ade160a49965254ce8e69ff826da5 and fixed a conflict

Change-Id: I71968a3d6c8ea979735780e3d538a8b90be05522
4 files changed