Merge "Change factoryReset to succeed for Settings" am: c687700cde am: 9d59a75463 am: 38b73db735
am: fd8c03aadc
Change-Id: Ib8361625c9d0ef00f6cbbb6e35b5167ce8d7dcd6
This commit is contained in: