merge from open-source master

Change-Id: Ife9c7a92ed7abd59b6b3612ba908bcae77055767