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

Change-Id: Id551e8ae3aa635ea2fe893da008aace9d9508420