Merge "Add new tags"
am: c18cebd376

Change-Id: Icba0cfe37d0a6a5bcb751d6fd8dbb0ced5af0972