Reconcile some diffs FROM PARTS UNKNOWN

Change-Id: I4d724c8eec44ec914776fab536c1f609d9c171a8