Merge 6b4786887734248e0f1d00f47912b4268b5a22b8 on remote branch

Change-Id: I0077ce8c84446f71aa0aab444f09f10bcf9afb09