Merge "Deep clone settings for system package update" into honeycomb