merge from open-source master

Change-Id: I20cf00dba6908eeee12645e6878db7becdc2a5f9