Merge "Support static address configuration" am: 81ab4871 am: 33624ce0 am: 1cc5aa4e am: 0a2db46d Change-Id: I112214162c581db7bfd8a588cf551b5ce554979c