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

Change-Id: Ic63b6f6bf187ea632a05a6524d3b0f8bef376b74