Merge "Modify getting of primary storage size"
am: 1c876b73b3

Change-Id: I94a26e80a75f03278a8e90d9ec2e4ca0cfbf0a81