Merge "Use mCurrentUserId instead of ActivityManager.getCurrentUser()"