Merge "Enhance keymaster tests" into jb-mr1-dev