Ensure nomobile always gets applied

Change-Id: Ic5b8fadddbfd1031e6595f8d8e9c911c80c2473a
Merge "Ensure nomobile always gets applied"