Merge "[DO NOT MERGE] Fix unexpectedly NPE on CF when calling mDevice.getProductName()" into sc-v2-dev