Merge "Give DPM callers unsafe labels." into pi-dev
am: a80057c359

Change-Id: I1db954072cd00caa70ef527b885a1893668b3eac