Merge changes from topic "rtt-settings-change-cp" am: 668300083e am: 27357872c4
am: 675b89196c

Change-Id: I6b6b0dff27c57beb0e350bc47f2cfe07853623a2