Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e6d2b89ce3  -s ours am: 01d3fde036  -s ours
am: f73f2bd9c5  -s ours

Change-Id: I8cf6161ca539046f0ed6566366dc2f556c686282