Merge "Thermal shutdown fix: cool down on writing to disk" into pi-dev
am: 0cc63ef090

Change-Id: Ieb9fe51c3a729413a1aa7f0c044246eb1c7c836c