Test: manual Bug: 178093024 Fix: 178093024 Change-Id: I2a2e6bbbcd00f4d64c3226f3b22a9880acc3c412 Merged-In: I2a2e6bbbcd00f4d64c3226f3b22a9880acc3c412 (cherry picked from commit 3a4750be)