Changed GLOG to VLOG.
Added missing include.
Added another missing include.
Merge remote-tracking branch 'origin/next' into vault_manager_update