Merge "[automerger skipped] Import translations. DO NOT MERGE am: 09da14be40 -s ours am: 76a64e725c -s ours
am: 22fce7c88c -s ours
am skip reason: subject contains skip directive

Change-Id: I31b98eb4704ccb706ae9d5a5d3273ea89eccd246