Fix some things lost in merge caf merge commits

Change-Id: I3482bf297d4112941001cdd5ca948d04b4551315