Address some comments for the soft restriction CL

Test: compiles

bug:130739772

Change-Id: Ibf545434db59d17affcc0bba54a9ca7cf16c4012
2 files changed