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

Change-Id: I7aeda3d969c64565fc0d6d1ce14e5353d441879b