Merge "Update strings for bubbles" into rvc-dev am: 73b2a34e am: 4d532917 am: 4f18cca9 am: 58ddfe1b Change-Id: I395f9c4888ab91c9e09350420cd4086018ce3d90