Now that we no longer support py27, we can use the standard library unittest.mock module instead of the third party mock lib. Change-Id: I749d6ebdef9163ffa3135778a4accbb8be5ba9e3
Change-Id: I43d22cff939f7ca9c2561aadee0157075dbc217b