Fixes to simplify programmatic creation.

Change-Id: Ief2c794b0c50ce8016737628b9a7348574590039
6 files changed