Test: n/a Bug: 64267858 Merged-In: If98233bb6607458d56dc2804e0c761597372925e Change-Id: If98233bb6607458d56dc2804e0c761597372925e (cherry picked from commit deea0ca9)