Multirom Fix

Change-Id: I708bbfe2d71b8ebd72051c51d4163cccb103eec0