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

Change-Id: I2201774012da04b8920e298899329af8339452f0