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: 8c1bc888

* commit '8c1bc888':

Change-Id: Iee1fed7283bb561e7dd8f3d9a37da1c8fb8cfc16