Merge changes from topic "gatekeeper_maintenance" am: 1e05627ecc
am: b7f916b983

Change-Id: I15597f7fc90380ab37b59c10b9bfa26bb404b915