tree 4e0288dcd8457d6cfbee7e3f66a6fb5608245a13
parent 119251268c594d115a1eff31b3ec32108b88b593
author Yu Shan <shanyu@google.com> 1558500135 -0700
committer Yu Shan <shanyu@google.com> 1581637987 +0000

Fix a bug that would cause OoB memory read. am: a6c9ad41f7 am: e19472c066 am: 628e78b390
am: 986170a648

Change-Id: I4ec3eede5fa2fd015cc2eb7a14d18b6047a177d7
(cherry picked from commit 6fe077934ab20a109ee54c3624e3aea4ea386c34)