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

Change-Id: I386a53c649e8d8651d93f438252a50a597dc9148