Merge "[automerger skipped] Import translations. DO NOT MERGE am: aa555fee02 -s ours am: e7e2603966 -s ours
am: 357ce8e346 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib84a3daf70ef04e3a4b5c8a05d01492e40337533