Merge ae527ab6e8fab7a840840bedb85de72ac44cac5e on remote branch

Change-Id: If2c18294d01850e212123d1ebd8549141f617b34