Merge \\"Use a round rect background drawable for \\"clear all\\"\\" into nyc-mr1-dev am: b8292a6401
am: 3deaaf5f3f

Change-Id: I7650d235ba9b9f80f5b04943df19ed2ed42e3b1c