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

Change-Id: I6591661ac38e96e9675d39ed48c8310a893924d3