Merge changes from topic "gatekeeper_maintenance"
am: 1e05627ecc

Change-Id: I0ab186875fde3148ad18164226893c3494cb669b