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

Change-Id: I9be182b9db266944216795f8ca538141dd9c1e47