Android 7.1.2 Release 14 (NHG47N)
Merge \"Fix possible out of bounds accesses\" into nyc-dev
am: 552a4cda50

Change-Id: Ic263b85ba2afbacd1a54db114f47f03a41360dba