Android O MR1 Preview 2 (OPP6.171019.012)
Import translations. DO NOT MERGE am: 12907529af  -s ours
am: dfec0378a3  -s ours

Change-Id: I9885694042a287329740b44aaf83442d868f260d