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

Change-Id: Ic2829b66bb30141aba2418651e354e32076be1e8