Merge "Add new tags" am: c18cebd376
am: 3225daaaa6

Change-Id: I4473bd8ece582a89dd401a5081721c9acdd1d858