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

# Via Android (Google) Code Review (1) and others
* commit '64f03f37e3c0963c168ec7517d4c6ebe588e3c33':
  Add redirect for removed file.