Make device modules mobile-targeted

Change-Id: Ibee7dc880072ac59c357ef9c58f2a5c5cc650168
Merge "Make device modules mobile-targeted"