rebase on galaxysl camera, starting up

Change-Id: Id93be4e15c36a3916a37f9e22c7f8f412f7b50e8