[automerger skipped] Import translations. DO NOT MERGE am: 53e826122d
-s ours
am: c47b5e1943
-s ours
am skip reason: subject contains skip directive
Change-Id: I2077d19fea3c18f021f13eef7fee86e43e45cd66
This commit is contained in: