Removed deprecated 'primary' flag

Change-Id: I7cfa0dbd38fe40edebfce2ee42b1743cacf54c5c
5 files changed