[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours
am: b227fad96a -s ours
am skip reason: subject contains skip directive

Change-Id: I7257f9247032fe4fe119610faf8c7df27122c365