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

Change-Id: I0fc1afd3dda2b62310883fd17e1cd09d530788a4