Changed 'Scanner' to 'scanner'. Bug: 153271332 Test: make Change-Id: I4c34314753277859860dc3b981ba4ea86025557d (cherry picked from commit 10b13264)