Update

bring inline with AOKP