Merge b05dc8521bc564cea69c84f22b2df39dcbf723e6 on remote branch

Change-Id: I535c01759f899abb49f28ef69db653403e0e785b