Remove unnecessary inter / intra condition check. Change-Id: I51b776a3df6ce45b31fe3d2f43fbf6ca7b1d14fb