Merge "Remove downgrade check for targetSandboxLevel" into pi-dev
am: d55f0108c5

Change-Id: I5c42e8d96666b4a3bbe942a4a4e59bd95a4028ae