Gatekeeperd maintenance
am: 3a1eb672c5

Change-Id: I7ae604143fa811ce33611cef20b61196c77b1b5a