Merge changes from topic "pi-telephonydebugmenu" into pi-dev
am: 0cf2e41bf8

Change-Id: I21d57ebf1930cf69fed2525c5b0f12e2bc3b1953