Schema:Edit instrumentation
Depends on Ib8612626
Bug: T88027 Change-Id: I67f1000d23cb257df29d5d4be8ae85764458e6c1