some parts fro CM

Change-Id: Ie827deca8a87bd710cf61eb3822a7d4e84322fa3
Signed-off-by: ChampionSwimmer <android@championswimmer.tk>