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

Change-Id: I214977be62710e359839acd25fda1b22d7f043f8