synchronize with compat

Change-Id: I3acc2d20025bbbf1c9959f8e02fb7f816807eecd