Merge changes from topic "system_default_prop"
am: 4cb631f624

Change-Id: Idf0c10bdcb44e021f1f56b11e8abd7168d0c5499