Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev...
Merge "Fixed a bug where the image and the text were overlapping" into nyc-dev am: 33f39a96 am: 93492ed1
am: a02ec260
* commit 'a02ec260':
Fixed a bug where the image and the text were overlapping
Change-Id: I132dd395177bc13b8f3cc8c83398dd6e58f94d03