add google edition assert

Change-Id: I9abfda8954fc1928606d71c83ea7071cbf02b8d6
Merge branch 'cm-10.1' into martincz