Upstream changes

Change-Id: I13a26d2b73b2669b6290670e8fce76f0512ec207