[automerger skipped] Import translations. DO NOT MERGE am: 51b1eac0a6 -s ours
am: 6ae230f577 -s ours
am skip reason: subject contains skip directive

Change-Id: I8bb7d4fa2202434b1e6ecdcde6874bfdb81133ca