Merge "Replace oneway shortcut api with AndroidFuture" into sc-dev