Merged-In: Ide278450fa058b6dc565bff395f541dc7b574905 Bug: 315507370 Change-Id: I1831ca9b459f19974b0030cb019157e803031511