[automerger skipped] Merge "RESTRICT AUTOMERGE: Fix bug decoding JCS_RGB jpeg files" into oc-dev am: d9b0ae829d am: ce7eab87b9  -s ours
am: 42c4d770d1  -s ours

Change-Id: Ic6d6b66416dc316980884d67a3e3e8926079cb10