Merge "Fix lval/rval confusion in imgdiag"