Merge "Disable art_verifier on mac." am: f5705e3502
am: 9de7b695a4

Change-Id: I2305e019524f578af2d53a832532a367a5057bfa