[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807 am: 5e3def3f70  -s ours am: 599b561ff1  -s ours
am: 4aa205acf7  -s ours

Change-Id: Ifb889541c383d0cb413838c1e2097b784564e4f7