[automerger skipped] Import translations. DO NOT MERGE
am: c0a1b85fe9  -s ours

Change-Id: Ifd8ef3608d72531408fbb928fc45b5ca66b2a3d9