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

Change-Id: I11b957781eaab2702b3c7f1466c89ce60a5c30c8