Fix for broken hotfix detection (#14838)

Change-Id: I65a5b9a2f632bed357deb6106beb2d25f2d1a032