Merge "Fix two mistakes in art script rewrite."
am: bdf294e34a

Change-Id: I2e85a9e6b49bd5ef22124fe581efae705bb70f34