merge from open-source master

Change-Id: I5f7880bec0c15ae7a42175107d8192ad44b847ca