Merge "Add bundle format minor version check logic" am: 3cf4b8664a
am: 6074cb8805

Change-Id: I449f3ebc0c471adf612751f62d0b61b30748a37a