Merge "init: disable oneshot_on test" am: 56188cc1c2

Change-Id: I40c518da7bfea5f026acdce7c83c85476f3a3452