Avoid using Optionals as method parameters As per the recommended guidelines [1], using Optional in method parameters is discouraged. This change replaces such usages with more appropriate alternatives [1] https://gerrit-review.googlesource.com/Documentation/dev-crafting-changes.html#:~:text=to%20local%20variables-,Optional,-/%20Nullable Change-Id: Ib80e35da25d652cdc2329cbf7c719fdb0da402ec