Merge "Scope certs for wifi UID and handle migration" into jb-mr2-dev