Delete dictionary items which have ATTR_NOT_SPECIFIED

Change-Id: Idf13457cac065ec8cdb386239a9596beb0ace617
Merge remote-tracking branch 'upstream/master'