Merge "fs_mgr: overlayfs readme caveats" am: fe04d7ce7e
am: 3497216d8e

Change-Id: I25a04280d2a29dcc31b910d0c0ab76183641ab0a