Security tightening, part 2

Change-Id: I0e7e31136d861a6c1bce1a7e5d023585c1e3137c
Merge "Security tightening, part 2"