Merge "Update to support keymaster's configurable version."