AOXP: tweaks

Change-Id: I9f0b0bee3a7a533027a878a406b32f9bd4cd4c25