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

Change-Id: Iee45d93a65d6a87b4f28a8137b52019bae720659