merge from open-source master

Change-Id: I3607454a9257701855354c12ef1f36841c889aea