Fix: 185470518 Test: manual Change-Id: I3a345929ed09e895f54622bd151a60f0c9acab31 (cherry picked from commit bc2ce2a6)