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

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