Weekly upstream merge

Change-Id: I21b06fe7681773a77623cfd05905f6af4e67258f