Merge "Add bundle format minor version check logic" am: 3cf4b8664a am: 6074cb8805 am: 58104312c8
am: 61bce74c47

Change-Id: I1a1dc18e994fab8ba2cfbe98078f38222a36d1fc