Merge "Forcefully convert to basic Intent before calling PM API." into tm-dev