Merge DAX2 changes

 Change-Id: If6fcfdef0b051f9015c127bdd7d28e3668e47435
 (cherry picked from commit 4879ebb6d14558695044be0a22a89fc8b7ac24ec)

Change-Id: I5ecf6c792bf1d5c481879a38231acfdb2a3ccc3e
1 file changed