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

Change-Id: Ibcbc6929e32bc32fa4aa9a971fc32276ebc41a9a