Bug: 72156674 Test: Manual; Test Application Change-Id: I1a61f421903f528fb1272bc6d39b644aa046dc1a (cherry picked from commit 858d36dc)