Bug: 35727295 Test: manual verification using client using old API Change-Id: I5589c5e38c11fc4d2a04df6c540a8cded6475ac4