Merge 6736d7af0b6cf2eeb3970571c912bfcd9f17f8c1 on remote branch

Change-Id: I26a7ef260a3d8d6d8ef9086c73631fcf8914661f