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

Change-Id: I9eb1ca8a19cca3a28e81392dbd988e5c2cee02c7