Bug: 64272195 Test: N/A Change-Id: I07a7d9b9dfbf69acba0123bf4ec6e309c2a5a359 (cherry picked from commit dd214c2d)