Merge "Add device side mainline module detection" into qt-dev am: 7c50294d23 am: 372ab6b630 am: 5f990ac5a5
am: 1a1c78fc60

Change-Id: Ia36ae396cb3dd0dc1a84f32125fd3537881f759a