Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread