Merge "Fix problem passing null optional operands." into oc-mr1-dev
am: 072811f5fb

Change-Id: I9d5094edbf5c5d9525a6549cbd3fe3d80716cfca