Merge "Putting clear-all button on the right to match design." into nyc-dev
am: ee66ab9

* commit 'ee66ab941c03f653c424c694b69099a396de5caa':
  Putting clear-all button on the right to match design.

Change-Id: Ie2985ac0149b316a06cde83d000308cedf3ae128