Fixes: 143653080 Test: presubmit Change-Id: Ia7715fe98c6a1f3a2d7e5cc702fadda1761e0f8e (cherry picked from commit 133d12a7)