Cherry-pick commits from release-0.2.

* Added ClearToken class
  ClearToken can be used for replacing some dictionary
  attribute value by key-name.
  I39ac36beb277cd517d1b5cd901f57ed064a88556

Change-Id: Ifb867bb624cc9314cdf900b0efa55441ce305e80