Merge "init: clarify a comment" am: 5642bd2384
am: ac7b81fc66

Change-Id: I60df3f19848ac5530853d92c463a16985d67437f