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

Change-Id: I4deef37d4d692152bc8d414d0377a119eaecf78c