Merge "Handle another untyped dex CONST issue"