PR for code review

I also deleted this po. it's now in mainActivity po.