Merge "Rely on com.android.internal.os.SomeArgs"