Merge "Drop value if the bucket is totally tainted" into pi-dev
am: 5bc03014c0

Change-Id: I92b47ad538eeec38fbf4b4d7211dc75ebf903880