Merge "Remove unused variable from screencap." am: 376234fc74
am: 32bdb1e9b0

Change-Id: If4c2b39333270982975feb1745b3bbaaa3a177b8