Merge "Remove unused variable." am: f3b1881bb2 am: f338ed34f9 am: cab27fbbf4
am: a3c801bac4  -s ours

Change-Id: I1f1a9817e73c4f1fa59605a5484a2a08017b008d