Squash aosp 4.3

rebase

Change-Id: Ifdf728f3fb1214ec8b0098bfb87f670d0b9df103