Merge "Updates training/camera/photobasics.jd with FileProvider details" into nyc-dev