bf8c58be5a
This change is mainly for a follow CL that will refactor the decode_tiles. Change-Id: I52de6f8dbada75a64d9a94ebb5975136ed0960b4