Code cleanup

Change-Id: Ie2de06f1954167012fa6ed5d71c9d6893673c83e
1 file changed