Find 7a: Update init scripts from stock

Change-Id: I45b6110ded762aeac16b3e97f274fb4684618f9f