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

Change-Id: I8bcb6a5ca45793f2b79cc535e6bf025d3b0604fc