Initial changes for OmniROM

Change-Id: I5b99146977421d90e943704f03ae840fa4f0f64a