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

Change-Id: I9ae801c950d002bb308f596dc56a4cf18c164eb3