Merge "Include some warnings about vendor_available for fsmgr." am: cecf5480fe
am: bcdc9b4995

Change-Id: I4ba3f70ebbb272641e62b9968efd1c9b8ae36bd8