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

Change-Id: I4285caedaed50bf49eada0b3ef3a5f08db660764