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

Change-Id: I164607804909655fa17f9f1a428ede8f28420888