Merge "Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev am: ebf7abb19e  -s ours" into nyc-mr2-dev-plus-aosp