Base: Add default tag manipulation
am: 3aa893647c  -s ours

Change-Id: If6a78cb8cc3e0d54c2971c815f6599878badb01d