Merge "Exclude mount entries for vendor overlay" am: d184eb1fd9 am: f0bcff916a
am: dab4013783

Change-Id: Ifa8ead190c245ef37b5d65b95f9b12ccd63356f7