Merge 0726dbfebb8014cc1f35cb8b302123767ba98e17 on remote branch

Change-Id: I053e59665b01a026b10bd7290363c6a94bf2b9e2