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

Change-Id: I9efc3c2dab5fd976ac252f388794b0847b5634ca