Merge "Merge "Merge "Fix two IndexOutOfBoundsException crashes." into oc-dev am: ded5608f18" into oc-dev-plus-aosp am: e1c75566e5" into oc-dr1-dev-plus-aosp