Bug: 64752751 Change-Id: Ib05135cd94f5251942a6fc6df542ed39083f7827 (cherry picked from commit e5ad41bc)