by using hyphen instead of dots and underscore Change-Id: Iba8131fff3d92100d554a07f42f23c7a38c2e469 Closes-Bug: #1716694