Allign with AOSP

Change-Id: If7ba3fa40c441c60795ed596ebcc91412c10824d
Signed-off-by: Evan Anderson <evan1124@gmail.com>