Merge 6f47a1cffffe655fc1e2eba7367a499ed4c1e986 on remote branch

Change-Id: Ic68139d4c191425af0fc3860797f25976780fb98