rebase template

bootanimation + for consistence changes

Change-Id: Ifbf1c9c558b72725e40690e065f47ab7fa78d938