Merge \\\\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9 am: cb805b35f3  -s ours am: 662e2a7975 am: 0eadbe6d36
am: 378b7d1f39  -s ours

Change-Id: I81c892217d6ca9296dcbb6c0a278827ffe7d8a1e