(cherry picked from commit 534a0a18) bug: 64382372 Test: m Change-Id: Ied19a466cf96e8aa77ee0be1ee990d421372644d