bring in sync with aokp gerrit version