Test: manually tested Bug: 151095863 Change-Id: I4f04f08f76d039196c2c67bac80d4a46ebec87f2 (cherry picked from commit 0e758099)