merge from open-source master

Change-Id: I53af51f3c14806f2302daeea62a125621851d2cc