Bug: 178189250 Test: manual (using POC in bug) Change-Id: I787915c0493d18500e7531bd0ca7191532441f93 (cherry picked from commit 87adff69)