Merge "Add config to skip showing CF fail-to-disable dialog" am: d32138d78a am: a0df3496d3
am: 4025ccb0a1

Change-Id: Ida23475584fb0324ce12af05af422230b170b1a4