Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b5c190fdb1 -s ours am: 89dcbd9a80 -s ours am: 2744618843 -s ours
am: f59c6b4e6d -s ours
am skip reason: subject contains skip directive

Change-Id: I1d77c6c0269d3bf19056a20b0b580bf3d6cef3ee