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

Change-Id: If69966f603c87a07e506f82bf5d8eabda22e70ae