Merge "Fix permanent denial of service via apis with illegal intent filter" into tm-qpr-dev