Updated product model for AOSP+

Change-Id: Ie2f711f693d29f3aee770be4aaa26f0915b37cd8