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

Change-Id: Iaeb61121f5854bbbc7f762e131be1c1c27d14331