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

Change-Id: I7b156ff4b1a75ae96aba6d15bb6dfdda2703cd74