Merge commit 'e2d33bbc496192d49c1e48baad446d8d0720d301' * commit 'e2d33bbc496192d49c1e48baad446d8d0720d301': StrictMode: time violations in Binder calls
Merge commit 'e2d33bbc496192d49c1e48baad446d8d0720d301' * commit 'e2d33bbc496192d49c1e48baad446d8d0720d301': StrictMode: time violations in Binder calls