am f3c12f4d: am 60eb73ed: (-s ours) am 54b22ca2: am ff5be396: Merge changes from topic \'init-rc-breakup\'

* commit 'f3c12f4d7d0e3ebb508fe647c5901ca609f951be':