Update copyright date, remove unused variable, import Change-Id: I731c48c8e5b16cbee5230f1d02109f249b8bab5d
Change-Id: Ibfd358121f8f9fbbf3b9bc06c5be7b9300e0ba53
Change-Id: Ia7a8611d7212b9201994034d17da1d18e106107b