Merge "Add strings for RTT settings UI." into pi-dev
am: 8bcf26a183

Change-Id: I892b0dfd53aa91887a66e2b179c14a28b869650b