am 2f031d0d: am f2b0ed6d: am 74712136: Merge "Fix helper_invocation.* rendering mostly black." into mnc-dev

* commit '2f031d0d4de312d2aba9c139e50c732de1126941':
  Fix helper_invocation.* rendering mostly black.