Temp fix for permission issues

I want to unblock QA. So I'm writing this small fix, while
the full fix is still in review.

Bug: 22066742
Bug: 21791169
Change-Id: I8d422ae7d3c8f189c9c7f697d8a9f4c1ec1d5785
1 file changed
tree: 8720ab1d65a83764056ac868c61ecdfe3de8f91f
  1. src/
  2. TestCommon/
  3. tests/