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

Change-Id: Ie73ddfcbf564778b7a3d085773ef6fba3ad66977