Merge "Address feedback on art script."
am: c861ec89b0

Change-Id: Ie6d15f3f5a0d0897d23c2a3ba8e33b23cc05f335