Temporarily disable AUTO_DETECT

Change-Id: I38ebe8697cb80190feeb0ae4df572e74cbea9a31
Signed-off-by: Rashed Abdel-Tawab <rashedabdeltawab@gmail.com>
Merge "Temporarily disable AUTO_DETECT" into cm-10.1