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

Change-Id: I6d6029753c7e5728fc49e04cf402b5c4db5d115a