Merge \\"Refactor LOCAL_INIT_RC\\" am: cc715fa5d4
am: f8b7ae9c14

Change-Id: I19f8b2283fefc2e4f9e66896516b7a7ec87afb60