Merge "Remove unused declarations." am: 1c2efaaa11

Change-Id: I6f5723efcb0a5835e88b626cfce940dae5822b83