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

Change-Id: Iaca6877b904f0de5c3e89e5ba990313f74bd7559