Stop building device control

Change-Id: Idf624be7119a569bfb2b15be6614142589f8f446