Merge "Move assist package to sdk 26"