This CL fixes a var name and puts "final" in the corrent order. Test: m Change-Id: Id7ec3ac1c6f63d03cabe0d878e84a9ed24386d33