Also, updates the work related strings accordingly. Fix: 71987096 Change-Id: Iedbf6ee04f3a165a392efdf2bd351817997817ca
the feedback from API council Fix: 71818127 Test: Build Change-Id: I4bfb0eecb281961e24a4f613485420e9e8b357ab
Fix: 69905244 Change-Id: I5958b3a2ebba2fa0e0f69448d5526dc72ed6a97b