Merge "Before/AfterClass need to be static." into pi-dev
am: 5fe5af9ae9

Change-Id: Ib7a8fbc90dcf07f4f4c5a8f9c5160c2a26365108