merge from open-source master

Change-Id: I612711a84996e22e826e4920be29c204cf5d7d44