Correct lint errors that arise from these version updates. Change-Id: I3216032b0d383ca6d4f6304c92151ce12dc5e114