Merge "Bind with the correct action" into oc-dev
am: e7ec7ec634

Change-Id: I761c5e112a75aa7314821f36c932e98b90be1aec