Merge \"Fix divergence between interpreter and compiler.\"
am: 1fe7627d5b

Change-Id: I735ae1dfcbfe9fc769f1b463be65d09d1f2be22b