Merge changes from topic "gatekeeper_maintenance"
am: e180ec52a2

Change-Id: Icabc50dbd9feefce25561678beb9901fe03507e0