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

* commit '95db1cfc741c23c7f4192128e3b7bb3c43761bdb':