Merge "Remove unused declarations." am: 1c2efaaa11 am: d975d10334 am: 0b201e01e6

Change-Id: I2fa4c211966ba6eeb0c8ce7bb9280e3438fa42fd