Add some missing tags

Change-Id: I0e7c5442ad27322e771dbbec88b0c779f39c05a6
Merge "Add some missing tags"