Merge "Move PersistentDataBlock* in server to its namespace" into udc-qpr-dev-plus-aosp