[automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03 skipped: ccc16f92d7
am: 387047a201  -s ours

Change-Id: Ib85a1fe883e15d23907bbc51724847617240158d