default: sync with master

Change-Id: I2e9bd186835607060a626cda720a8b8a2f9b0e99