MT6589: Revert some commits temporarily and fix nvram permissions

Change-Id: I4a8f940fd07729fd22e7b031ee4d65fe4cb57b8e