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

Change-Id: I47b1476b76aaea727372c9302f870cda78a7da01