Merge "Merge "Always clone golden files before editing them." into qt-dev am: 8be3ae5838 am: d6db09d156" into qt-r1-dev-plus-aosp