Merge "Base: Add default tag manipulation"
am: 2b49abe447

Change-Id: I85039168969b16ecdee31635091e7bff25dd2ce5