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

Change-Id: I17d212fb199d6fad6a500a1c48ab464c6a172237