DO NOT MERGE. Fix Palette bucket test
am: c6ede06ccd  -s ours

Change-Id: Iddffc446e39397ca724698057baccf14c2a40f3e