Merge "Revert "Improve user-friendliness of art script."" am: 7a0ab7862e
am: 589dd7b9ec

Change-Id: Idc6f0c2192bcdedb9dcdb637fa977a8e452c4962