Support for digital dock path

Change-Id: Iab2c2bf3e07e2ac1ad773d793a1061f00303d3fa
Merge branch 'cm' into HEAD