Merge "DO NOT MERGE: Whitelist ACTION_DEFINE and ACTION_TRANSLATE" into oreo-mr1-cts-dev