e62b71f89a
Isolate references to BasicType inside method implementation. Change-Id: I4be2ad5b8b42fb7a84da0755106d8f0b08034690