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

Change-Id: I71619906c311583fc78d1c26d6f63ea4ddce3a91