Merge "OPP: Trigger media scan after transferred file"
am: 79bcd5be56

Change-Id: Id98f7ceccd979e51de6f5c30a0fec745c876a93d