Lint fixes

Change-Id: Ic453597488ef92723a81a224e7443e8f454b25da
2 files changed