Sync X-Device rules with MobileFrontend

Due to the nature of these changes, this revision can be deployed
before the corresponding MobileFrontend changes.

Change-Id: Icd800c94e178cdc39ea985bafa8f6df1933ef06a
Merge "Sync X-Device rules with MobileFrontend" into production