Merge "Bumped DEX format version to 040." am: ba6932af4c
am: 98318494cb

Change-Id: I5522f65234202d845ba5c01c4825a02a5759a30c