Handle legacy synchronous inspectors am: be46b75c3b

Original change: undetermined

Change-Id: Ia43d4219e2d2260c3d74b7933e2e03bb772d4ee8