merge from open-source master

Change-Id: I99ae03ba51ee185b9cfecf4f26e94a757f3815c2