Merge "Prevent OOB read in rw_i93_process_sys_info()" into oc-dev
am: 2c605825f8

Change-Id: I734d76f4dda37f53c611eb3c6c555e5f66bab867