PR#2985 (Imported from upstream's 2cb761c1f4) Change-Id: I3e4f3c0c558dd2e1cc5ed2df1651834018627342
2cb761c1f4