Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 6fe655eb70 -s ours
am: 5d5aae9536 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibccc201e5a951b07e82cec494161101e753a2b97
This commit is contained in: