merge from open-source master

Change-Id: I5804d8850f2d4fb7b5d5c53d51e153f7ced9646e