Sync upstream

Change-Id: I61e4f9077ef96f4a207aa153324ad7d9b1d8796e