Merge "Bind service in onCreate" into oc-dr1-dev