Rework CL, https://android-git.corp.google.com/g/#change,34511
due to the history unfork change.
4 files changed