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

Change-Id: I5d37c4200def1441de0aa36cec77140bb54665ab