Merge "Add non-updatable-api tracking"