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

Change-Id: Ibf7dd395f1d62f9182460c816b4c45cde325a39f