Merge "Remove unused using decls."
am: 6eeee3a03f

Change-Id: Ie42e2c12e5aed8a037b9f5371653c31772e5914d