Merge "Add null check for DeviceProductInfo" into rvc-dev am: 8fce9febad

Change-Id: I215a326fa26e0d471ca30d0503b9553e2a65e8c5