Merge "Setting clock flags for GPS clock" into oc-mr1-dev
am: 67be3e2f64

Change-Id: I102f0c5c6e122a8f98d1c422dcc18670d72b2767