Merge "Handle corrupt RegisteredServicesCache XML." into jb-mr2-dev