Merge "Mock blacklisting satellites in default implementation" into pi-dev