Merge "Missed setting default values" into pi-dev
am: 42a53783f5

Change-Id: Ieac43cf7bd32a15d2e91c43a45258f9226be18f1