Merge "Update app op calls due to internal API change"