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: e1e991dd
am: 93859bf9
* commit '93859bf9':
Change-Id: If4a554b927ac2723a5fe53fdf0be37431de50085