Test: manual Bug: 30622771 Change-Id: I5a589c98553f35248b0d95d332e9f35774075b24 (cherry picked from commit e7f89b07)