Merge "Owners update and sort" am: 80b026a194 am: bdc386e428 am: fa08cc7ae7
am: 9bb1142b4f

Change-Id: If43f266f006e3d237e58905f0758438a60809338