Merge "Delete relics left behind by commit 86e6b7ed51dab3e ."