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

Change-Id: Ic13004cc1c9afa5474df291211333e215ad96424