Merge "Add logging for OneSearch entry point." into tm-dev