Merge "Just print warning log instead of triggering WTF" into rvc-dev-plus-aosp