Support backward-compatible for Q am: a0d6f3db34

Change-Id: I41b2ae5128264e3bb3112e10dd75b99e36ab6ed6