Rebased on r395; custom su location setting is temporary gone now
Added su location settings - based on r395.