Merge commit '37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd' * commit '37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd': Enable strictmode logging in system_server & add a lock.
Merge commit '37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd' * commit '37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd': Enable strictmode logging in system_server & add a lock.