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

Change-Id: I5310af2f5f7d5969c427fd1034f072e9d4da829f