Merge "Allow null fill values to support authentication case" into oc-dev am: 90bcc1c8bc
am: 0e4f1bab09

Change-Id: I4f95cb012fd5d8b96c2beb097aa3b09c8c557b74