Merge "RESTRICT AUTOMERGE: Fix the error and make the argument nonnull" into tm-qpr-dev-plus-aosp