merge from open-source master

Change-Id: I895b74454b35da7eba6c0f6250fe2ca6c9907f1d