Merge "Fix minor linter issues around includes and using." am: cef30b31 am: 2a83688a am: 69806117 am: 99f1dc90 Change-Id: I849f098f3b447ca00df2394a062d0d05f60355dc