Update Manifest to Version 24
Merge branch 'update-cwac-module'