An empty attribute list is not the indicative factor of whether or not to empty out and re-fill the list of attributes, as having no attributes is a valid scenario and should lead to no attributes present on the output side. Change-Id: I3464cd6cf0709a38b7c89a2f138d7a0329ce993bpull/1786/head