Merge "DO NOT MERGE: Fix for intent namespace check." into pie-cts-dev