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

Change-Id: I590e8ecfbc3f6b65a79e4be21308cc4f159d6185