Fix another image regression

Since 'upright' can have a value or not, the non-value version
was getting picked up by the interpolated regex. So I had to
separated the two lists of options explicitly, and in another form
than what we already had.

Change-Id: Icfe1b9a7b4352e018a8818e213fb454a9656c5f2
Merge "Fix another image regression"