Merge upstream changes

Change-Id: I3372c0868dca4f65b14010fc2db13986d33c49ed