Merge "Fix two IndexOutOfBoundsException crashes." into oc-dev am: ded5608f18 am: 5caa419730
am: 9ce029c36c

Change-Id: I4b84591ab7eaf788974733d2320b3a574b709db1