This will go into the 12.0.3 release. Change-Id: I3792dcdd9f87556b9de435818cec1700630a7b26 Related-Bug: #1548450