Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev am: 0bdfc7be66
am: 77988e4aec

Change-Id: I02d6144c1b0ed72e178cd4e3899670b7d4c3d5a9