Merge "add oneway mark in old api" am: e8128da6fd
am: de24f20707

Change-Id: I492cc3fecb80242cbb7a498df1b0ecffef4a0ce7