am 03ab4eb5: am aefe4aa4: Merge "Prevent construction/use of invalid restore...
am 03ab4eb5: am aefe4aa4: Merge "Prevent construction/use of invalid restore session proxies" into jb-dev
* commit '03ab4eb5':
Prevent construction/use of invalid restore session proxies