Mad merger, fix

Change-Id: If6823ca03a0cc8f7a2330c4e1324c01776006ae9