Test: manual verification Bug: 111276913 Fixes: 119440304 Change-Id: I8dc97e4517367eaf8736741ce04040efaeb84355