diff -Nru google-compute-engine-oslogin-20210108.00/debian/changelog google-compute-engine-oslogin-20210122.00/debian/changelog
--- google-compute-engine-oslogin-20210108.00/debian/changelog	2021-01-14 08:39:31.000000000 +0000
+++ google-compute-engine-oslogin-20210122.00/debian/changelog	2021-01-25 10:58:12.000000000 +0000
@@ -1,3 +1,24 @@
+google-compute-engine-oslogin (20210122.00-0ubuntu1~16.04.0) xenial; urgency=medium
+
+  * Backport to Xenial with the following remaining changes:
+    - Revert to using dh-systemd because Xenial does not have the debhelper
+      version making dh-systemd obsolete
+    - Revert to compat mode 9 requiring only debhelper 9
+    - Build-depend on libboost-regex-dev for regex support
+    - Link with boost for regex support
+    - Free tests from C++11 constructs to let them being compiled without
+      C++11 support
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Mon, 25 Jan 2021 11:58:12 +0100
+
+google-compute-engine-oslogin (20210122.00-0ubuntu1) hirsute; urgency=medium
+
+  * debian/gbp.conf: Add basic gbp config
+  * New upstream version 20210122.00 (LP: #1913049)
+    - call correct function in pwenthelper
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Mon, 25 Jan 2021 11:51:32 +0100
+
 google-compute-engine-oslogin (20210108.00-0ubuntu1~16.04.0) xenial; urgency=medium
 
   * Backport to Xenial with the following remaining changes:
diff -Nru google-compute-engine-oslogin-20210108.00/debian/gbp.conf google-compute-engine-oslogin-20210122.00/debian/gbp.conf
--- google-compute-engine-oslogin-20210108.00/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ google-compute-engine-oslogin-20210122.00/debian/gbp.conf	2021-01-25 10:58:12.000000000 +0000
@@ -0,0 +1,4 @@
+[DEFAULT]
+debian-branch = ubuntu/master
+debian-tag = ubuntu/%(version)s
+debian-tag-msg = %(pkg)s Ubuntu release %(version)s
diff -Nru google-compute-engine-oslogin-20210108.00/src/oslogin_utils.cc google-compute-engine-oslogin-20210122.00/src/oslogin_utils.cc
--- google-compute-engine-oslogin-20210108.00/src/oslogin_utils.cc	2021-01-08 18:48:30.000000000 +0000
+++ google-compute-engine-oslogin-20210122.00/src/oslogin_utils.cc	2021-01-22 00:05:26.000000000 +0000
@@ -226,7 +226,7 @@
       return false;
     }
     // General failure to load the cache occurred.
-    if (!status || http_code != 200 || response.empty() || !LoadJsonGroupsToCache(response)) {
+    if (!status || http_code != 200 || response.empty() || !LoadJsonUsersToCache(response)) {
       *errnop = ENOENT;
       return false;
     }