Don't log a warning when Super Dev Mode is off.

Change-Id: Id958f469c20d283f943f85e2291b14e1238c1614
Merge remote-tracking branch 'upstream/master'