Initial changes for AOSP

Change-Id: I0a6f5837bbb21d7105b3eb2cd77f2ab01fb6b9ab