Merge "Make log available to product and vendor am: 2d849d358e am: f6b6038ec9 am: 3c6eb3cd7d am: fed13c96e0 am: 5823e52c09"