Workaround invokesuper underspecified behavior.
am: ffaa91d39b

* commit 'ffaa91d39baf82006afe74ad6e59cfd498334017':
  Workaround invokesuper underspecified behavior.

Change-Id: Ifab8e2cf5e38f75028e9ce585c47fa430307430c