Wearable support lib 2.2 and swap in google() plus minor spacing fix.
am: cd94b83113

Change-Id: I0f90beebf2e757d1559bd399f29fe766a8cbb707