am a6972684: am f7a19173: am adad989b: Merge "Add a stub to fix master-gpl"

* commit 'a697268442a68fef255863f0a8a0fa1a610dc340':
  Add a stub to fix master-gpl