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

Change-Id: I3246c5d406ba319f9c6965b99de839a37446732c