Merge "Merge "Workaround for crash from invalid snapshot" into rvc-dev am: 10250f67 am: 67fd0fd1" into rvc-d1-dev-plus-aosp