Organize up a bit and sync with local changes

Change-Id: Icb8a011a4adb8ab80da8675b2abc8bede4642762