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

Change-Id: Ic065135e2812818ac90e814d5759f343eed6d862