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

Change-Id: I3261dcf031cbd7e6f4d5209876bdad6bec67c616