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

Change-Id: I0a5445868966fa8f68ab36fa078cdbe29e1961db