Merge from open-source master

Change-Id: I61c25b1a833960ec83f0f92b7bf775c767f00f45