Merge "Support static address configuration" am: 6d175120a0

Change-Id: I9637c44f3e88e5e9d08be59a0eb03e019e9919e1