Merge commit '032b3bc9a94fe7f490cb4b2e7bca3a7167465cfc' * commit '032b3bc9a94fe7f490cb4b2e7bca3a7167465cfc': Fix http://b/2131173 (gaps between Gallery tiles).
Merge commit '032b3bc9a94fe7f490cb4b2e7bca3a7167465cfc' * commit '032b3bc9a94fe7f490cb4b2e7bca3a7167465cfc': Fix http://b/2131173 (gaps between Gallery tiles).