Merge "Don't check program selector's type for equality." into pi-dev
am: a2015451a7

Change-Id: Id2bf66e26c54a2a8cc86b408b240d6984fb5b97b