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

Change-Id: I70513c67674e197c08a8d29387ce445fa38d06a3