Updates from upstream master

Change-Id: I02ce557b1359e74beebe1637574c5b17116bc783