Merge "Renumber test 990-method-handle-and-mr to avoid collision in CTS" am: b2a9999a6d
am: 99a235e3ea

Change-Id: I90fa4347c316abe371a553aa0bd28eb476d9f878