Merge "bliss: Update gms package path" into s