Merge "Fix lval/rval confusion in imgdiag" am: 2dcdf529e5 am: 3f04ed1cfe
am: 33a16ae01c

Change-Id: I60f7834c8f97872f2fa118a87806b425943aa22f