Merge "Merge "Workaround for crash from invalid snapshot" into rvc-dev am: 10250f67f1 am: 2a28c02401 am: 8def3186e2" into rvc-qpr-dev-plus-aosp