Merge "frameworks_base: ES translations" into cm-10.1