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

Change-Id: I92440bdf578653d34871b4e0ac2fcac3709cb444