Import upstream master

Change-Id: I678e1ff829ee3a05091c1487c90f29734dd93077