Removing invalid directories Change-Id: I75132bd1b521f53f61041ce76f585010b6de5b7e
Needed for coverage 4.0 Change-Id: Ie3c85460577357568cdcd0926297e9fdaa2d6847
Change-Id: Id480b25a628ac11e8def458846bb31d45463a5a6