am 0a5481db: Merge "Pushing in fixed scrubber asset" into honeycomb

* commit '0a5481db2256651ffe75e0f6e7e01b333ea5df3f':
  Pushing in fixed scrubber asset