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
am: 7c82913555

Change-Id: I8629c1658afb0b8c8cd868252f7b53859b347281