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

Change-Id: Id27a9fb58677f7e32cd694eef8f27698f0c26fc2