Fix duplicate revision tags

Change-Id: I4ad4afd5a375b493b9caf721fcd7dab9f9322a24