Update cwac module
Update Manifest
Merge branch 'update-cwac-module'