Merge 3355ad6ecb6ea39f03ff0a93f1a5989e226dda02 on remote branch

Change-Id: Ic180cad0ec9ac7a026064fe7b769d593bc8138a7