am a68f69a5: (-s ours) am d59bf385: (-s ours) am b563144a: Merge "Update IP_JB to support multiple image sizes."

* commit 'a68f69a5010a088bbae4d9a1d9873e0cf89978eb':