Merge "Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7 am: 4362396184" into nyc-mr1-dev-plus-aosp
am: 5fafee9819
* commit '5fafee981993da295aecc34a9601c6a59ca41af2':
Change-Id: Ic12f33600b6c106049963b7e0c1f64ba747b734a
This commit is contained in: