Merge "Add and update string" into pi-dev am: ef9b8cda82
am: 5487984da5

Change-Id: I2844fcdf4bf053434d4f5a57e367dfe1a3bf7b97