Glacier: Sync with evervolv

Change-Id: I086e531a3635df70486abe4ff352d6062b50970c