Merge "Import translations. DO NOT MERGE" into oc-dev
am: d72d69f45b  -s ours

Change-Id: Ib193aa19e764d410ca639a48feee73b8bd84c66c