Merge "Update app_api to fix style/lint issues"