am 9a53bb0f: Merge "[gatekeeperd] fix issue with SW->HW upgrades" into mnc-dev

* commit '9a53bb0f809ae6d048646da2cf720d32d14f1a22':
  [gatekeeperd] fix issue with SW->HW upgrades