Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 41b4f606be -s ours am: ab59418095 -s ours
am: 558b262c0d -s ours
am skip reason: subject contains skip directive
Change-Id: I09b40c7f25840ff5d6d18502cd60f47fb98ae437
This commit is contained in: