Merge "Consolidated all data allow/disallow logic into one method" am: 449d73251f
am: ab0f6fc5d2

Change-Id: I31606372f361ad0cb8d9600f79c41257e121c7f4