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