This was a missed replacement from cherry-pick of: 9ac7a9dc Change-Id: I9e01d9d7a39bed397500a293bf68dca2746aa917