Don't allow consecutive apostrophes

Turn them into '_

Change-Id: Id5625e262dc7e97fe8c5debe1401f1a509132034
Merge "Don't allow consecutive apostrophes"