am 895623e5: Merge "check if uid=0 before attempting remount"

* commit '895623e5cafc35450bc6cef5f6d4ca7195c6b08c':
  check if uid=0 before attempting remount