More updates

Change-Id: I8fc283e797d23e5a81775e5b0471ff157fb8de1d
even more updates

Change-Id: I6094b5f218eb1858b8eb9d0866bbbb3176a633dd
AOSP_ALL: Sync with CM

Change-Id: Id858dc4aed4fce2e449836386c7cbfee71e6bb44