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

Change-Id: I0ab728def5bca070234d21b9119550596865f79d