Updated for Nightlies

via AOKP Rom Control and AOKP Gerrit Review