bug: 25371600 Change-Id: I7af21b063533085ce20c51d18f118c7752fd77f0 (cherry picked from commit b1874561)