Eliminate type error on search_s

Guard the list comprehension to eliminate 'None' valued keys from
the attrlist from causing an exception when trying to iterate on
the None singleton.

related-bug: #1231772
Change-Id: I823a53d100b5e4210c767507e3233b61ed372068
Merge "Eliminate type error on search_s"