Merge "Conserve expansion after re-inflation" into pi-dev
am: 0eb2be3a67

Change-Id: I44f868df5cafeac3bef09586403cf955bad1e581