Merge \\"Use visible paths when cleaning up MediaStore.\\" into nyc-mr1-dev am: 8ee0a67ba7
am: a637f17150

Change-Id: I0433fd57cb7da13d163eab1fde944cccec9c67bf