[automerger skipped] Rename FS_MGR_FS_STAT into FS_MGR_FS_STAT_DATA_PARTITION am: b95f21f9e8 am: 6533e0291a am: 3c581706a6 -s ours
am skip reason: Change-Id I3f1280ce84df1137a92ac59b15937a32c7ac8d01 with SHA-1 df1534db79 is in history

Change-Id: Ibc9b65fee185b9b57903ace5165888fa5eb2058a