Merge "Merge "Don\'t crash settings when out of space." into nyc-dev am: a1fe122b99 am: cf5a448ce5" into nyc-mr1-dev-plus-aosp
am: 0044da3ede
* commit '0044da3edec38f3482bea5d59e051ff9bcd6aeb1':
Change-Id: I30bac4c6654e1a2ae21d3a5daa76b2af1a6f2588
This commit is contained in: