Merge "Added support to calculate storage using project ids on devices whose...

Merge "Added support to calculate storage using project ids on devices whose user data is wiped and their add directories are created using project id" into tm-dev