Merge "Merge "Add assisted dialing properties to the framework." into oc-mr1-dev am: 5d04d92265 am: 4f6d728e62  -s ours"