Merge "Fix the use getContentUriForPath"
am: 07d3e18469

Change-Id: Ibb88619b07c0af8fe41be3dd4affd046cabf7de6