Android n mr2 preview 1
Import translations. DO NOT MERGE
am: 08d1b00aaa  -s ours

Change-Id: I872895214c093a87aced3e5229bb7317c1317dc1