Merge "Notify user when forced to boot into safe mode" into nyc-dev
am: 525032754e

* commit '525032754e69c2b1a40e75254247c26da58f06ee':
  Notify user when forced to boot into safe mode