Merge "Monitor package change to update AttributeCache for non-system server." into udc-qpr-dev