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

Change-Id: I55006baa01a9c7d1f7922bd2377f9be03c0f70a7