am e6649574: Merge "disable startup shimmy on sd card error" into ub-camera-glacier

* commit 'e664957471663effaa0cf1998b5a1134f5e19aa4':
  disable startup shimmy on sd card error