Test: manually Bug: 32025203 (cherrypicked from commit 835180a6) Change-Id: I787984fc8ab7151ecce9e62a25fa03b0ecf263cd