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

* commit 'cd23823d4f533431c76baa104eb50b7803b3b391':