Merge "Replace strlen with arraysize in array bounds." am: 70a5f12045 am: 5f186d057a
am: d427837d32

Change-Id: Ia9f3ad966545b25d05394d57f38f3c1107a69469