Merge "[cleanup] Move default storage dir to /var/lib"