Merge "Merge "Fix exception when trying to update config of detached stack" into nyc-dev am: a1984286d3 am: 7c7de841d5" into nyc-mr1-dev-plus-aosp
am: dee80373be
* commit 'dee80373be3362f6c7c719228b3803afcf30f4ec':
Change-Id: Iafb449296995c68e38ec8d91b636518f7e1fd292
This commit is contained in: