brown paper bag / fix build

Change-Id: I0218e9e9cbfa915e94ac7a510486b8123c7e46e2