Revert "sync codebase"

This reverts commit 080c5db73aba4028d9fee42e10e79c40f7f2a723.

Reason for revert: cannot boot

Change-Id: I9faa51651a5035b6a1a285fd640ba5bd58fe4c24
Merged-In: Ic45113b27aa8f90e1ec909068bf2d67589571b23
15 files changed