Merge "Improve user-friendliness of art script."
am: ffac46009f

Change-Id: I87fda827c77a41f0b9ffd41a7ca9be6f437f22a5