am 2f031d0d: am f2b0ed6d: am 74712136: Merge "Fix helper_invocation.* rendering mostl...