Merge "Fix lval/rval confusion in imgdiag"
am: 2dcdf529e5

Change-Id: I048123bd9c5514a85e4e56ec8af10043505c4e08