Merge "init.rc, typo: fs-post-data -> post-fs-data" am: 5b202c4376 am: e0ac5d8304 am: 311e4295dc
am: 06e9f5de8c

Change-Id: I1525db8d43c3c27fe7ae1b17dd97a99f28321c13