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

Change-Id: Ie3689cc2c0a9c03f42b1c3c02f57bcbe1f7a5c3a