Test: No test since change is NOP. Change-Id: Id069f18e7e75f3b34448cfbabb8ba84d7bb18d87 (cherry picked from commit dd48cc8a)