DO NOT MERGE - Reverting accidentally merged 524943 into glacier.

We only want it in Haleakala, but it go into glacier through another CL.

Change-Id: Ie08ec3e0d1ad7637650c45bf1908a04267464935
1 file changed