am 43017342: Merge "Fix GMS core crash loop"

* commit '43017342ea7541665a7ac3039bced27479eb869a':
  Fix GMS core crash loop