Merge "Bind service in onCreate" into oc-dr1-dev
am: 4e4c73bfc7

Change-Id: Id317c4003fd560c5cff4da7191198aa17ea97f7b