Merge "Fix issue with sort_api.sh" am: f943c52105
am: 66e9d98618

Change-Id: I230bec475595a84cba2c39e214b9e7195c2e0e1a