Merge "Fix double close in GetTreeBytes." am: 142702dc82 am: 45175c437f
am: 26f604eb5a

Change-Id: I3a250a6cb64c838186fb1912191df4960e00a73f