merge from open-source master

Change-Id: I5698914cf9093696ad851412a510a99419989d17