Merge "Make same-file available to product and vendor am: db68ca94ab am: ecefe5a577 am: 875acdd294 am: 0f1473f905 am: 9d9054a2bd"