Merge "Remove two unused constants" am: c7d6b57055

Change-Id: Ie8eaa1437931fa37a2c162aedb8fadc147299a30