Merge ab6759f352bd69805e6e9b5e653bc83ef628fe64 on remote branch

Change-Id: If14d5d320b90b164ffba93366234adcb7502449d