Let's see if grouper likes Os thumb2 more than O3

Change-Id: I3106581296bbb8724908da833dd7d413c8a7e664