Merge "Remove unused variable" am: 843ff0dafe am: 0662e869ad
am: c3b19d0279

Change-Id: I69a63105c8eca483aa3d32a49c76916c89c41ec4