Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf
am: 2cd2074f7f
* commit '2cd2074f7f20eeb3de52743dc2733eae25762ffe':
Change-Id: Ie2e2b4997c643421c5f53f3c46f91fe26ebf41dc
This commit is contained in: