Fix lint error

Change-Id: Icca28519c4206f87b4302f7719518c61798843e6
Merge commit 'b86a98043f12335598aadd09be789de2b8430eba'