Merge ae098bfb357f5a5571a95235658f6db7ac9bfa58 on remote branch

Change-Id: I7e12ce747f3bf2232d4901613ef9df98e723d220