Merge "Serialize AM.getContentProvider() calls in client side" into pi-dev