merge from open-source master

Change-Id: I1f2a4650c696c6a58d59b8fd6e96dc3a372ff095