Fix tag paths

Change-Id: I23f641cc134bcb3a38a0b9cb75a4508b72685c74