Fixes: 134594642 Test: presubmit Change-Id: I7b65d18df1625a276986a844569a1275c09df4e4 (cherry picked from commit 1cff0828)