Test: manual Bug: 30995038 Change-Id: I966294c5fb0b8297b2f336102996291f66c08d2c (cherry picked from commit e26dc3d1)