Merge "Switch case to suite to follow new gtest naming." am: 4f2048d370
am: 16f213a23d

Change-Id: I08ea85b3506edfc335335d0aa44bb4b83b15361e