Merge "Add default value to inline payloads" into oc-dr1-dev
am: 5aca5f3aec

Change-Id: Iabc71663e942b453e8125bc19401adccc06e85a3