Missing from bad merge

Change-Id: I3d290da25e3ffe71e921efaba62f8ebcf57f3dbb