Merge "[RESTRICT AUTOMERGE] Add relative address to DeviceProductInfo." into rvc-dev am: a1f69c6c13 am: 1d4881f7e4

Change-Id: I8ea8da64fbb8f6702c2a5f1e5868704d6be6ed30