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

Change-Id: I9ba0f6ac701174a1d6cdfdbc5008d40715295546