am 2f590438: Merge "Revert "Revert "Use optimizing for apps."""

* commit '2f5904383a7b7ffb741c8839ec3c60762860bad3':
  Revert "Revert "Use optimizing for apps.""