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

Change-Id: I8fa2410266137f0d7d95525cb565e59c20a49ce7