[automerger skipped] Add buffer length safety check to getScalarData am: dd2a6b0880 am: da4c622e88 am: e684cbc5c0
am: ddf204be51 -s ours
am skip reason: change_id Ib52e66d362d04d3c6f86c3f5b62c309f479876cc with SHA1 dd8cdc8d33 is in history

Change-Id: Ibf477d8d27c18399d9f4cf7b5247a23cdd8c9e2e