Merge "Timing issue in CTS tc "testPermissionDiffCert"" into gingerbread