am a11a001f: am 705b37b8: merge from open-source master