Merge "Workaround issue with pip overlay not hiding cleanly." into oc-dev
am: 99a885b5d6

Change-Id: I867ea37ccf803f8e43b2a2a1c2b5099f2711a4d8