meta-telephony.git branch 201705 updated. a0862396bc7478b6e4b0c490e2768a77a4b00fd9