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

Change-Id: I2ef86d178080bda37dac9afb21c396a76e3f5cec