Handle legacy synchronous inspectors am: 54d534f96c

Original change: undetermined

Change-Id: Iaaddb48cb3a066979f1ab41990eba48da397c308