Fixed crashes after merging from upstream.

1 job from develop in 23 minutes and 38 seconds (queued for 1 second)
Status Job ID Name Coverage
  Playstore
passed #9180
android
playstore

00:23:38