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

Change-Id: Iab280ccdc5f1dfb242a781eca4f31aaf90c7be03