Update from upstream

Change-Id: If0e2a166c50b1e6c104cb81f01c42e4f22d43c21