Merge "Loading gps_debug configuration before use" into oc-dev am: 08ca0a5a9e
am: 232b901493

Change-Id: I0be911b16e034f9e603ebf65c72b964444c1c054