Merge "[automerger skipped] Import translations. DO NOT MERGE am: f66042e2d0 -s ours am: d247d2b41f -s ours
am: 186bdd9c3b -s ours
am skip reason: subject contains skip directive

Change-Id: I592c0fc64662df8ab3b58aa753d31fa46271a54e