Updated so parameters indicate when they are optional.

bug: #1157020

Change-Id: I3a0594e18ba0d19821dddff8681531a7f32810bb
author: diane fleming