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

Change-Id: Ibb97f897a9564a03598c56e5e1514c9b645106ed