Merge "Workaround an interpreter behavior to fix leak" into oc-dev am: 745c6e02c6
am: 5067b8565e

Change-Id: Iae41224ff10a7a8a0d6f41d8a9ae63ba4261978d