Merge "Delete relics left behind by commit 86e6b7ed51dab3e ."
am: 880c9ffe7a

* commit '880c9ffe7a47c163f986f7bc02963bbde1c83c0f':
  Delete relics left behind by commit 86e6b7ed51dab3e .