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

Change-Id: I6c185f604e899f27a5c75aae883fd15de11033da