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

Change-Id: Ieef566fcd6a5148ab1f338f744b3a37d6931c160