Making sure disclaimer message is parsed in Flickr interface

Bug: 47345
Change-Id: I7e2bd70c19e07d1249cfa11585d1cd5fcfcabc93
Merge "Making sure disclaimer message is parsed in Flickr interface"