Merge "Allow keystore to read vendor security patch level."