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

Change-Id: Ice7cf0e7202502b40f52aba6bbeeee427fc55ef7