(cherry picked from commit d1ef7178) bug: 64382372 Test: m Change-Id: Ic8212858ff7416f7c1574c82a5aa6833b8d9335c