g2: upstream init.rc changes

Change-Id: Iba1af9e757eb3268684dabf0561264df9627c875