Merge "Fix NPE inside ItemInfo am: f24c614ad2 am: e28a06e5e3" into rvc-d1-dev-plus-aosp am: 763a9924e2 am: 5fb92f2542

Change-Id: I2f9c77b9bf79712099e8e67670d148048aeacba9