Merge \\\\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\\\"...

Merge \\\\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\\\" into mnc-dev am: 3e582390 am: 7abd7ba0 am: 87534f4a am: cb805b35  -s ours am: 662e2a79 am: 461309a6
am: 1ca90302  -s ours

Change-Id: Ia7b3c9756c7224ac38c028d9018813442fe02436