Merge changes from topic "telephony-debug-pi-tweaks"
am: 5ff91e4fbe

Change-Id: Ia2798429d3be242a56d8ac541668ada90ea499d7