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

Change-Id: Id5a4cc8818eef71a7ccbc48e32049f313651434f