am f48c3ac3: am f7c63421: merge from open-source master