follow changes of Omni on the location enabler

Change-Id: Iea08e40e8edd6b967445ea6047edd994e7e52906
Merge "follow changes of Omni on the location enabler" into android-4.4