Remove mobile hacks from bits

Change-Id: I1ff4b04587520b0c5a100f02e7b82ccb9ebb836f
Merge "Remove mobile hacks from bits" into production