Merge 323d7c48ca5865f16acd6de09b2efe5acb5a5606 on remote branch

Change-Id: I7eefbc66cb6352aaac654f471589f4ab8602a5eb