Merge DAX changes

Change-Id: Ib0bc38725f40bf84ae98535c27842bf45a065921
(cherry picked from commit bf9bb58baddd8335259fae60f901fd8725dc86dc)
4 files changed