[automerger] Various quickscrub fixes am: 9bb8ffb5e3 am: c7bf48338c

Change-Id: I2ed6d0318a36148bf177108d3d2c21506644d33f