Merge "Fix local reference table overflow error."
am: fe87781f40

Change-Id: I231ca7b7e7c5c35f805a4852ed7e1e57f09a9f92