Don't pollute global scope

Change-Id: I238294c9abec6a088cbb7f88dc4bc3f3ccb5cac6
Merge "Don't pollute global scope"