Merge "Support static address configuration" am: 6d175120a0 am: 7ea8df5599 am: f465942e66

Change-Id: I663332a12188521917e9e286cd6cb8927f7efd9c