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

Change-Id: I8d0267b2fab9d968f6a6403d629f786fd8fc15aa