Merge "Strings for pSIM on/off toggle removal" into qt-dev
am: 68a26e5535

Change-Id: I1ab73ba3e6e666a42590030d9dd6903f257b070a