am 527e9c8f: am 703e5d3c: StrictMode: avoid an allocation in common case

Merge commit '527e9c8f0471666b5b1c461f1a8a710192208e70'

* commit '527e9c8f0471666b5b1c461f1a8a710192208e70':
  StrictMode: avoid an allocation in common case