Merge "redirect removed file from cl:...

Merge "redirect removed file from cl: https://critique.corp.google.com/#review/121079434 am: 3548f40a am: e77eefbe am: ad6af19b am: 62362065 am: 732c9e0e" into nyc-mr1-dev-plus-aosp
am: 5e648952

* commit '5e648952':

Change-Id: I8db38d423199c5a6705a9f0bbd3ac91dcb0a2a81