Merge "Make safe label more safe" into pi-dev am: 06637b97dd
am: 118408f6ca

Change-Id: Icfadc3afecb91f12c77712d0b29e961f4414215e