Logic called for A || B but then used both; this splits that into two distinct code paths. Change-Id: I959e0649fbd5b4f404b5804e26806ba51c31c836