Merge "Consolidated all data allow/disallow logic into one method" am: 5d3bcfc78d am: 5bc6ab6445
am: 4eb31320fd

Change-Id: I315d43ab6b7da531b08a1446ddd403b3d32f7c05