am a88a8393: am 40e665a0: cleanup

Merge commit 'a88a8393c6321b7baebb621bcc4c1b3be1ac7793'

* commit 'a88a8393c6321b7baebb621bcc4c1b3be1ac7793':
  cleanup