This was triggered by This appears to be triggered by08cf2fd010
commit08cf2fd010
Author: Thorsten Behrens <Thorsten.Behrens@CIB.de> Date: Fri May 20 16:48:00 2016 +0200 which changed the order that things registered through registerDispatchProviderInterceptor are used by, so swap the order of registerDispatchProviderInterceptor calls here to sync with that Change-Id: I047e4c7f6cb488c646df717e22c8ac91864c3938