d2s: adapt from beyond2lte

Change-Id: I6752fe0c7f8483483485174cf55345d876620bfd
11 files changed