Merge commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca' * commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca': Some StrictMode API changes.
Merge commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca' * commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca': Some StrictMode API changes.