fix spec for new resolution rules

Change-Id: Ied3c893e347829d1f2ece1e52ddb06fd9fcbb3c2
fix spec for new resolution rules

Change-Id: Ia0d24981c1cd4837b0196d24ed98e857ba73b54a
fix spec for new resolution rules

Change-Id: Id66a54237468269a4c96b560adf94fdcad9a4f95
moving gunbai to a realm scope

Change-Id: I35d82b874a26f484d7404db6ce7cc8fe17b9abd9
fix spec for new resolution rules

Change-Id: Ida0cf22abf449e59c9ff27d3ba1bab9dbceec322