Merge "Restore legacy types when registering mobile requests" am: 85f67dc60a
am: 47453e01cb

Change-Id: Ic849eb5f85fd835fe4615f5a22afec3e569cf005