Upstream sync (2/2)

Change-Id: I18ff1ceb1d4171d3b1c2c916e148feb12322b5fa