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

Change-Id: I6435550247ae98735e068a723b02d4f59b88007a