Removed handling for ids of "None"

The server no longer sends them

Change-Id: Idc555754c284c2ebfc4dd5ba9fdd10f1655a7945
Merge "Removed handling for ids of "None""