Merge "Base: Add default tag manipulation" into pi-dev
am: 23d45d1cc7  -s ours

Change-Id: Ia890b545d7ffa0d9d2a63baaeee62f7017665b76