Update adds/removes

Change-Id: Ie254cbba1c5282da7a4486969589f2dfa5bf266c
pa 3.67

Change-Id: I510c174cb94d9bb1ecef19a5b38b7b7a0736a88a