Merge "Revert^2 "Improve user-friendliness of art script."" am: 02311bd39d
am: 9f5e0f46f5

Change-Id: Ic4b99f3b7010703a09e0440e69309b2ff6a3560d