Merge "fs_mgr: overlay drop redundant check" am: 5c61dbd12c
am: 3646a4ca5e

Change-Id: I6cb2540faab83d04adc84edc3ff15365a6b13c15