Merge "Restore legacy types when registering mobile requests" am: 85f67dc60a am: 47453e01cb am: 1a1a7f6e75
am: 7ae809eea6

Change-Id: I17e7bae58cc75bd176c57324f446552950e3682e