Merge "Add a format version file into the bundle"
am: a2feceb68a

Change-Id: I072c33e93d205d9a469e4801cca2f188015dbdcd