Merge changes from topic "rtt-settings-change-cp"
am: 668300083e

Change-Id: If05a3f29730cede46254f38280065c465e9da613