[automerger skipped] Import translations. DO NOT MERGE am: 91ca872a44 -s ours
am: 1b7486fe92 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic867e1efd3ccb97bcd7bc53c3185eb8d29feeb9a