Merge "Fix Array Index out of bounds error." into oc-dev am: 5c05814af4
am: 7e51b8b671

Change-Id: If6a037654ff0cb5be728ef0fa70553ea9b92ff88