Make sure we properly return a failure if no supported payload type is present. Change-Id: Ia483e0819b2d8ca0c2c5184c929dfe3d05c96ca1 (cherry picked from commit 5f6609de5d)
5f6609de5d