Merge "Test bundle format in AppCompat" into nyc-dev