Bug: 176457592 Test: Build pass and manual test(review UI wording) Change-Id: I66361cc6830aea96c55cdef737a9c5c3b8bd1b47