Fixes snapshot errors caused by 034519a12 (whoops) Change-Id: I094e3fae270c95ad2fcb500327ab867f3fb1c94b
034519a12