GerritControllerActivity test outline

Change-Id: Iee0561110cbcd94bb442a06edd66e9835d16001f
Merge remote-tracking branch 'origin/master' into develop

Change-Id: I0cce2721738eb7e25942b1251a67c7085550bb42