am: 9aed8c2f -s ours * commit '9aed8c2f': Import translations. DO NOT MERGE Change-Id: Ia3070d2cf441bdcd63f39ff90b8c77da1c37fc16