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

Change-Id: Id36d384021feafabd71ff382ca8054da2f67a722