AOSP_ALL: Sync with CM as of 7-9-13

Change-Id: Ib8d04e7315f9db7535cda712c37893958492017d