Merge "db845c: Add deferred_probe_timeout=30 to the boot arguments" am: b822c95220 am: 06fb1707db

Change-Id: I8edf79bda04fe8f16e9113fefd6d863fd0ba34f1