Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e4f2ebbd25  -s ours
am: bbf4ba81ac  -s ours

Change-Id: I533169dc01e2788ef2bb45de8a63ad816e061478