[automerger skipped] Merge "Set clientId when parsing an explicit...
[automerger skipped] Merge "Set clientId when parsing an explicit DHCP_CLIENT_IDENTIFIER option." into rvc-dev am: f8de4fdc -s ours
am skip reason: Change-Id I9da5fec47a74de36869e795fa9b1d7170d2f91c9 with SHA-1 fceda955 is in history
Change-Id: I6a221d71d6114a0d321d904a5da12c30482f7914