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