Fix: PHP Style corrections

* Explicit function visibility
* Uniform constant definition

Change-Id: I5f064d2eac0dedd4c8cc94f442c65f0e338ebbf4
Merge "Fix: PHP Style corrections"