bug: 62210114 Test: 657-branches (cherry picked from commit 6fda4271) Change-Id: I0e4f0577bcb1f3960459fe5d35473af191fc6534