am c8286562: am 24600336: am 64f03f37: am 451d3b83: Merge "Add redirect for removed file." into jb-mr1-dev

# Via Android Git Automerger (3) and others
* commit 'c82865621bb29c9fdf0d7f25b2a492b36adef927':
  Add redirect for removed file.