am 499127ea: am 8f3ade0c: Merge "Follow StrictMode refactoring."

* commit '499127eab812088ca24421b59ebfac6f47ea850f':
  Follow StrictMode refactoring.