Merge commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017' into eclair-plus-aosp * commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017': Handle cases where TYPE can be undefined, such as EAS.
Merge commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017' into eclair-plus-aosp * commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017': Handle cases where TYPE can be undefined, such as EAS.