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

Change-Id: I4e695864e492613400c9c5c0559349d2278e70ef